Skip to content

test: fix race in overload integration test#14586

Merged
mattklein123 merged 1 commit intoenvoyproxy:masterfrom
akonradi:patch-5
Jan 7, 2021
Merged

test: fix race in overload integration test#14586
mattklein123 merged 1 commit intoenvoyproxy:masterfrom
akonradi:patch-5

Conversation

@akonradi
Copy link
Contributor

@akonradi akonradi commented Jan 6, 2021

Commit Message: Fix data race in overload integration test
Additional Description:
When the stream is deleted by the test ending, there is a race with deletion of the fake upstream.
Using the test member variable ensures that the stream isn't deleted until after the destructor
runs and cleans up the fake upstreams.
Risk Level: low - test only
Testing: ran affected test with TSAN 100 times before/after
Docs Changes: n/a
Release Notes: n/a
Platform Specific Features: n/a

When the stream is deleted by the test ending, there is a race with deletion of the fake upstream.
Using the test member variable ensures that the stream isn't deleted until after the destructor
runs and cleans up the fake upstreams.

Signed-off-by: Alex Konradi <akonradi@google.com>
@mattklein123 mattklein123 self-assigned this Jan 6, 2021
Copy link
Member

@mattklein123 mattklein123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@mattklein123 mattklein123 merged commit fae2adb into envoyproxy:master Jan 7, 2021
mpuncel added a commit to mpuncel/envoy that referenced this pull request Jan 8, 2021
* master: (48 commits)
  Resolve 14506, avoid libidn2 for our curl dependency (envoyproxy#14601)
  fix new/free mismatch in Mainthread utility (envoyproxy#14596)
  opencensus: deprecate Zipkin configuration. (envoyproxy#14576)
  upstream: clean up code location (envoyproxy#14580)
  configuration impl: add cast for ios compilation (envoyproxy#14590)
  buffer impl: add cast for android compilation (envoyproxy#14589)
  ratelimit: add dynamic metadata to ratelimit response (envoyproxy#14508)
  tcp_proxy: wait for CONNECT response before start streaming data (envoyproxy#14317)
  stream info: cleanup address handling (envoyproxy#14432)
  [deps] update upb to latest commit (envoyproxy#14582)
  Add utility to check whether the execution is in main thread. (envoyproxy#14457)
  listener: undeprecate bind_to_port (envoyproxy#14480)
  Fix data race in overload integration test (envoyproxy#14586)
  deps: update PGV (envoyproxy#14571)
  dependencies: update cve_scan.py for some libcurl 7.74.0 false positives. (envoyproxy#14572)
  Network::Connection: Add L4 crash dumping support (envoyproxy#14509)
  ssl: remember stat names for configured ciphers. (envoyproxy#14534)
  formatter: add custom date formatting to downstream cert start and end dates (envoyproxy#14502)
  feat(lua): allow setting response body when the upstream response body is empty (envoyproxy#14486)
  Generalize the gRPC access logger base classes (envoyproxy#14469)
  ...

Signed-off-by: Michael Puncel <mpuncel@squareup.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants